Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Mon, 24 Sep 2007 12:44:51 +0000 (13:44 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Mon, 24 Sep 2007 12:44:51 +0000 (13:44 +0100)
commitc17db2f3e065f4e1c7c4f313dcaeda7a655ff070
tree54a8e62ee98ed6931d8229a9b5fdd662f8858241
parentd0d699be14e590babfd08554fbf6797a3cb53bc6
parenta62f71bad597e69213bc2b94cba057c274833f7d
Merge